From 04a455ace08f453ba48e780357f97a9fb47c7a0b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 20 Mar 2009 17:58:44 +0000 Subject: [PATCH] (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce a float value. --- src/editfns.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/editfns.c b/src/editfns.c index cfce1f2add6..aac670bb35b 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1319,23 +1319,33 @@ This ignores the environment variables LOGNAME and USER, so it differs from DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0, doc: /* Return the effective uid of Emacs. -Value is an integer or float, depending on the value. */) +Value is an integer or a float, depending on the value. */) () { /* Assignment to EMACS_INT stops GCC whining about limited range of data type. */ EMACS_INT euid = geteuid (); + + /* Make sure we don't produce a negative UID due to signed integer + overflow. */ + if (euid < 0) + return make_float ((double)geteuid ()); return make_fixnum_or_float (euid); } DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0, doc: /* Return the real uid of Emacs. -Value is an integer or float, depending on the value. */) +Value is an integer or a float, depending on the value. */) () { /* Assignment to EMACS_INT stops GCC whining about limited range of data type. */ EMACS_INT uid = getuid (); + + /* Make sure we don't produce a negative UID due to signed integer + overflow. */ + if (uid < 0) + return make_float ((double)getuid ()); return make_fixnum_or_float (uid); } -- 2.30.2